-
Notifications
You must be signed in to change notification settings - Fork 1.4k
[Swift Build] Default to the package's declared deployment target if none is explicitly specified #9139
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
@swift-ci test |
let hostArch: String | ||
#if arch(arm64) | ||
hostArch = "arm64" | ||
#else |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: else-if-x86_64 would be better
@swift-ci test |
1 similar comment
@swift-ci test |
Not sure how I broke the self-hosted plugin tests but those are reliably failing with this patch... |
@swift-ci test self-hosted |
@swift-ci test self hosted |
4c8704d
to
ab11e91
Compare
@swift-ci test self hosted |
ab11e91
to
570bbea
Compare
@swift-ci test self hosted |
570bbea
to
749c8cb
Compare
@swift-ci test self hosted |
@swift-ci test |
@swift-ci test macOS |
@swift-ci test |
1 similar comment
@swift-ci test |
@swift-ci test self hosted |
61614ac
to
f46e7bf
Compare
@swift-ci test |
1 similar comment
@swift-ci test |
Only remaining failure is a warning due to duplicate /usr/lib/swift rpaths, because both the driver and build system are adding one for the back deploy libs |
@swift-ci test |
@swift-ci test self hosted |
1 similar comment
@swift-ci test self hosted |
@swift-ci test |
@swift-ci test self hosted |
1 similar comment
@swift-ci test self hosted |
#endif | ||
|
||
// Unversioned triple - build should pass | ||
try await fixture(name: "Miscellaneous/RequiresOlderDeploymentTarget") { path in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: can we make these as parameterized tests? the test arguments can be the the extraArgs
. We can also add an ID to each argument to describe the test intent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO it's a bit easier to read written out like this since we're already parameterizing based on build system
) | ||
} | ||
|
||
if buildSystem == .swiftbuild { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
question: why is this only applicable to SwiftBuild? Should we verify and ensure the native build system also fails?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The old build system has incorrect behavior here, I replaced the check with a known issue
|
||
var env = Environment.current | ||
|
||
// FIXME: This is largely a workaround for improper rpath setup on Linux. It should be |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue (possibly-blocking) the path setup on linux is fixed in #9218. This PR depend on it so it provides the proper fix/solution.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The stdlib rpaths are a different set from those added in #9218. We can likely drop these runtime paths entirely soon but I need to test that out in another patch first
f46e7bf
to
3c5f731
Compare
3c5f731
to
0bf305f
Compare
@swift-ci test |
@swift-ci test Windows |
@swift-ci test self hosted |
1 similar comment
@swift-ci test self hosted |
Default to an unversioned triple if the user hasn't provided one so we don't raise the deployment target to a version the package may not support
closes #9095